Check that index is not bigger than level array length also when depth is

2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>

        * gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):

        Check that index is not bigger than level array length
        also when depth is 1. Now get_iter_first correctly return
        FALSE when the model is empty (#129411).

diff --git a/ChangeLog b/ChangeLog
index eb21e70c267b2854bc540a81ddba684b69011894..c379ace58cb35cb50d4c4cedae561cd3a0be43b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
+
+       * gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
+
+       Check that index is not bigger than level array length
+       also when depth is 1. Now get_iter_first correctly return
+       FALSE when the model is empty (#129411).
+
 Wed Dec 17 23:31:19 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): only

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index eb21e70c267b2854bc540a81ddba684b69011894..c379ace58cb35cb50d4c4cedae561cd3a0be43b6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
+
+       * gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
+
+       Check that index is not bigger than level array length
+       also when depth is 1. Now get_iter_first correctly return
+       FALSE when the model is empty (#129411).
+
 Wed Dec 17 23:31:19 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): only

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index eb21e70c267b2854bc540a81ddba684b69011894..c379ace58cb35cb50d4c4cedae561cd3a0be43b6 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
+
+       * gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
+
+       Check that index is not bigger than level array length
+       also when depth is 1. Now get_iter_first correctly return
+       FALSE when the model is empty (#129411).
+
 Wed Dec 17 23:31:19 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): only

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index eb21e70c267b2854bc540a81ddba684b69011894..c379ace58cb35cb50d4c4cedae561cd3a0be43b6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
+
+       * gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
+
+       Check that index is not bigger than level array length
+       also when depth is 1. Now get_iter_first correctly return
+       FALSE when the model is empty (#129411).
+
 Wed Dec 17 23:31:19 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): only

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index eb21e70c267b2854bc540a81ddba684b69011894..c379ace58cb35cb50d4c4cedae561cd3a0be43b6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2003-12-17  Marco Pesenti Gritti  <marco@gnome.org>
+
+       * gtk/gtktreemodelsort.c: (gtk_tree_model_sort_get_iter):
+
+       Check that index is not bigger than level array length
+       also when depth is 1. Now get_iter_first correctly return
+       FALSE when the model is empty (#129411).
+
 Wed Dec 17 23:31:19 2003  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (gtk_tree_view_search_equal_func): only

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index eacb3d5c0ae295735d389c035381e63910214f47..ab393219c3da8ead0cca16b6cfd8e5d175d1f2ce 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -970,8 +970,12 @@ gtk_tree_model_sort_get_iter (GtkTreeModel *tree_model,
       level = g_array_index (level->array, SortElt, indices[i]).children;
     }
 
-  if (level == NULL)
-    return FALSE;
+  if (!level || indices[i] >= level->array->len)
+    {
+      iter->stamp = 0;
+      return FALSE;
+    }
+
   iter->stamp = tree_model_sort->stamp;
   iter->user_data = level;
   iter->user_data2 = &g_array_index (level->array, SortElt, indices[depth - 1]);